From d5278b599403a0753554f1b883091598f46d70a2 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Tue, 7 Sep 2010 15:45:15 +0900 Subject: [PATCH] Removed _gtk_window_reposition() _gtk_window_reposition() was only some extra confusing code, internally it only calls the public API gtk_window_move()... replaced calls to _gtk_window_reposition() with direct calls to gtk_window_move() and removed the redundant internal API (probably there only for some historical reason). --- gtk/gtkwindow-decorate.c | 6 +++--- gtk/gtkwindow.c | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/gtk/gtkwindow-decorate.c b/gtk/gtkwindow-decorate.c index ea14b5218c..1a276f85b4 100644 --- a/gtk/gtkwindow-decorate.c +++ b/gtk/gtkwindow-decorate.c @@ -370,7 +370,7 @@ gtk_decorated_window_motion_notify (GtkWidget *widget, dx = x - deco->last_x; dy = y - deco->last_y; - _gtk_window_reposition (window, win_x + dx, win_y + dy); + gtk_window_move (window, win_x + dx, win_y + dy); } if (deco->resize != RESIZE_NONE) @@ -554,14 +554,14 @@ gtk_decorated_window_window_state (GtkWidget *widget, _gtk_window_constrain_size (window, w, h, &w, &h); if (w != deco->last_w || h != deco->last_h) { - _gtk_window_reposition (window, DECORATION_BORDER_LEFT, DECORATION_BORDER_TOP); + gtk_window_move (window, DECORATION_BORDER_LEFT, DECORATION_BORDER_TOP); gdk_window_resize (widget->window, w, h); deco->maximized = TRUE; } } else { - _gtk_window_reposition (window, deco->last_x, deco->last_y); + gtk_window_move (window, deco->last_x, deco->last_y); _gtk_window_constrain_size (window, deco->last_w, deco->last_h, &deco->last_w, &deco->last_h); gdk_window_resize (widget->window, deco->last_w, deco->last_h); diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 5f75dae6fe..c42abd0a17 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2159,16 +2159,6 @@ gtk_window_remove_embedded_xid (GtkWindow *window, GdkNativeWindow xid) (GDestroyNotify) g_list_free : NULL); } -void -_gtk_window_reposition (GtkWindow *window, - gint x, - gint y) -{ - g_return_if_fail (GTK_IS_WINDOW (window)); - - gtk_window_move (window, x, y); -} - static void gtk_window_dispose (GObject *object) { -- 2.30.2